From 6ab25cd7912a623151d0d6aa5876cd6de1987ea9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Florian=20M=C3=BCllner?= Date: Tue, 3 Jul 2012 22:50:25 +0200 Subject: [PATCH] windowManager: Update animation of attached modals With modal dialogs no longer being attached to their parents' titlebar, the current animation no longer works too well. Use a simple fade animation instead. https://bugzilla.gnome.org/show_bug.cgi?id=674499 --- js/ui/windowManager.js | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js index 59aa1f3ce..eaecb9f55 100644 --- a/js/ui/windowManager.js +++ b/js/ui/windowManager.js @@ -321,28 +321,12 @@ const WindowManager = new Lang.Class({ })); if (actor.meta_window.is_attached_dialog()) { this._checkDimming(actor.get_meta_window().get_transient_for()); - if (this._shouldAnimate()) { - actor.set_scale(1.0, 0.0); - actor.show(); - this._mapping.push(actor); - - Tweener.addTween(actor, - { scale_y: 1, - time: WINDOW_ANIMATION_TIME, - transition: "easeOutQuad", - onComplete: this._mapWindowDone, - onCompleteScope: this, - onCompleteParams: [shellwm, actor], - onOverwrite: this._mapWindowOverwrite, - onOverwriteScope: this, - onOverwriteParams: [shellwm, actor] - }); + + if (!this._shouldAnimate()) { + shellwm.completed_map(actor); return; } - shellwm.completed_map(actor); - return; - } - if (!this._shouldAnimateActor(actor)) { + } else if (!this._shouldAnimateActor(actor)) { shellwm.completed_map(actor); return; } @@ -398,7 +382,7 @@ const WindowManager = new Lang.Class({ return; } - actor.set_scale(1.0, 1.0); + actor.opacity = 255; actor.show(); this._destroying.push(actor); @@ -408,7 +392,7 @@ const WindowManager = new Lang.Class({ })); Tweener.addTween(actor, - { scale_y: 0, + { opacity: 0, time: WINDOW_ANIMATION_TIME, transition: "easeOutQuad", onComplete: this._destroyWindowDone, -- 2.39.5